From: Ulrich Müller <ulm@gentoo.org>
Date: Sat, 17 Jan 2015 23:06:13 +0000 (+0100)
Subject: Fix mistake in rebase/merge conflict resolution.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3408^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3065125d314a4cb97aa7982e2d06f48759865af7;p=emacs.git

Fix mistake in rebase/merge conflict resolution.

Remove lines from lisp/vc/vc-bzr.el again that were accidentally
restored in commit 2015-01-17T09:56:45!ulm@gentoo.org.
(Previously removed in commit 2014-12-01T13:24:27Z!esr@thyrsus.com.)
---

diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 94574fdec62..96d6d1da48c 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -493,9 +493,6 @@ in the branch repository (or whose status not be determined)."
     (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t)
     (message "There are unresolved conflicts in this file")))
 
-(defun vc-bzr-workfile-unchanged-p (file)
-  (eq 'unchanged (car (vc-bzr-status file))))
-
 (defun vc-bzr-version-dirstate (dir)
   "Try to return as a string the bzr revision ID of directory DIR.
 This uses the dirstate file's parent revision entry.